Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 4 Jun 2010 11:31:07 +0000 (11:31 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 4 Jun 2010 11:31:07 +0000 (11:31 +0000)

Trivial merge